Make the fb backend compile against current freetype. (#148558, Nicolas

2004-07-28  Matthias Clasen  <mclasen@redhat.com>

	* gdk/linux-fb/gdkprivate-fb.h: Make the fb backend compile against
	current freetype.  (#148558, Nicolas Deves)

diff --git a/ChangeLog b/ChangeLog
index 03389f24bdeadd602b44e34fc6509e18cab37f2d..0875b23a60330c6ed4deb83dc0dd1321affc5fc2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-07-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/linux-fb/gdkprivate-fb.h: Make the fb backend compile against
+       current freetype.  (#148558, Nicolas Deves)
+
        * gtk/gtktreeview.c: Replace the EXPANDER_MAX macro by 
        ROW_HEIGHT.  (#145528)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 03389f24bdeadd602b44e34fc6509e18cab37f2d..0875b23a60330c6ed4deb83dc0dd1321affc5fc2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-07-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/linux-fb/gdkprivate-fb.h: Make the fb backend compile against
+       current freetype.  (#148558, Nicolas Deves)
+
        * gtk/gtktreeview.c: Replace the EXPANDER_MAX macro by 
        ROW_HEIGHT.  (#145528)
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 03389f24bdeadd602b44e34fc6509e18cab37f2d..0875b23a60330c6ed4deb83dc0dd1321affc5fc2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-07-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/linux-fb/gdkprivate-fb.h: Make the fb backend compile against
+       current freetype.  (#148558, Nicolas Deves)
+
        * gtk/gtktreeview.c: Replace the EXPANDER_MAX macro by 
        ROW_HEIGHT.  (#145528)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 03389f24bdeadd602b44e34fc6509e18cab37f2d..0875b23a60330c6ed4deb83dc0dd1321affc5fc2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-07-28  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/linux-fb/gdkprivate-fb.h: Make the fb backend compile against
+       current freetype.  (#148558, Nicolas Deves)
+
        * gtk/gtktreeview.c: Replace the EXPANDER_MAX macro by 
        ROW_HEIGHT.  (#145528)
 

diff --git a/gdk/linux-fb/gdkprivate-fb.h b/gdk/linux-fb/gdkprivate-fb.h
index 62a1727f6a33dea3141ea46ef60f07f3a4716e7b..a64d06edfad4a89173e22c839ffe6c7d84470d2b 100644 (file)
--- a/gdk/linux-fb/gdkprivate-fb.h
+++ b/gdk/linux-fb/gdkprivate-fb.h
@@ -38,7 +38,8 @@
 #include "gdkregion-generic.h"
 #include <linux/fb.h>
 #include <stdio.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 #define GDK_TYPE_DRAWABLE_IMPL_FBDATA (gdk_drawable_impl_fb_get_type ())
 #define GDK_DRAWABLE_IMPL_FBDATA(win) ((GdkDrawableFBData *)((GdkWindowObject *)(win))->impl)